watcom export fix. (cmake version?)

fix missing return

Author: d3x0r

.efte/efte.fte

@@ -0,0 +1,31 @@
+
+
+mode C {
+    TabSize = 3;
+    IndentWithTabs = 1;
+    CursorThroughTabs = 0;
+    SpaceTabs = 0;
+}
+
+object GLOBAL {
+    C_Indent = 3;
+    C_Continuation      = 4;
+    C_BraceOfs          = 0;
+    C_CaseOfs           = 0;
+    C_CaseDelta         = 4;
+    C_ClassOfs          = 0;
+    C_ClassDelta        = 4;
+    C_ColonOfs          = -4;
+    C_CommentOfs        = 0;
+    C_CommentDelta      = 1;
+    C_FirstLevelWidth   = -1;
+    C_FirstLevelIndent  = 4;
+    C_ParenDelta        = -1;
+}
+
+eventmap MODEL {
+    key [C+O_H] { WinHSplit }
+    key [C+O_Enter] { BufListFileSave }
+}
+
+

.hgignore

@@ -0,0 +1,45 @@
+syntax: glob
+*~
+*.kdev4
+
+syntax: regexp
+_svn$
+err$
+/xx$
+\.i$
+\.vcproj.*\.user
+\.vcproj.*\.old
+MSDebug
+/Debug C\+\+/
+MSRelease
+debug-.*$
+release-.*$
+/[Dd]ebug$
+/[Rr]elease$
+static_debug-.*$
+static_release-.*$
+\.user$
+\.suo$
+\.ncb$
+\.sdf$
+\.ipch$
+\.orig$
+\.rej$
+/.git/
+/.svn/
+[Ss]ql.[Cc]onfig$
+[Ss]ql.[Ll]og$
+memory.dump$
+/p$
+.aps$
+.bat$
+tmakefile$
+glob:include/sexpat/sexpat_external.h
+glob:include/png/pngconf.h
+glob:include/sqlite3.h
+glob:include/zlib/zconf.h
+glob:include/genxml/genx.h
+glob:include/png/png.h
+glob:include/zlib/zlib.h
+glob:include/sexpat/sexpat.h
+^build

.mtn-ignore

@@ -0,0 +1,28 @@
+_svn$
+err$
+/xx$
+.*\.i$
+.*\.vcproj.*\.user
+.*\.vcproj.*\.old
+MSDebug
+MSRelease
+debug-.*$
+release-.*$
+[Dd]ebug.*$
+[Rr]elease.*$
+static_debug-.*$
+static_release-.*$
+.user$
+.suo$
+.ncb$
+[Ss]ql.[Cc]onfig$
+[Ss]ql.[Ll]og$
+memory.dump$
+/p$
+.aps$
+include/sqlite3\.h
+include/zlib
+include/genxml
+include/png
+include/sexpat
+.hg

Android.cmake

@@ -0,0 +1,118 @@
+message( "Included" )
+
+set( ANDROID_SDK_VERSION_NUMBER 8 )
+set( ANDROID_NDK_TARGET_PLATFORM 14 )
+set( ANDROID_NDK_VERSION android-ndk-r8b )
+set( ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT} )
+
+#set( ANDROID_NDK_PREBUILT arm-linux-androideabi-4.4.3 )
+set( ANDROID_NDK_PREBUILT_VERSION 4.6 )
+set( ANDROID_NDK_PREBUILT_VERSION_LONG 4.6.x )
+set( ANDROID_NDK_PREBUILT_ARCH_LONG arm-linux-androideabi )
+set( ANDROID_NDK_PREBUILT_ARCH thumb )
+#set( ANDROID_NDK_PREBUILT_ARCH armv7-a )
+#set( ANDROID_NDK_PREBUILT_ARCH armv7-a/thumb )
+#set( ANDROID_NDK_PREBUILT_ARCH ${ANDROID_NDK_PREBUILT_VERSION_LONG}-google )
+
+set( ANDROID_NDK_PREBUILT ${ANDROID_NDK_PREBUILT_ARCH_LONG}-${ANDROID_NDK_PREBUILT_VERSION} )
+
+
+# if the version is less than X, then build is before prebuilt and platforms
+#set( ANDROID_NDK_BUILD build )
+
+
+SET(ANDROID true)
+SET(ANDROID_OPTION_LIST
+    -I${ANDROID_SDK_ROOT}/${ANDROID_NDK_VERSION}/build/platforms/android-8/arch-arm/usr/include
+    -fpic
+    -mthumb-interwork
+    -ffunction-sections
+    -funwind-tables
+    -fstack-protector
+    -fno-short-enums
+    -D__ARM_ARCH_5__
+    -D__ARM_ARCH_5T__
+    -D__ARM_ARCH_5E__
+    -D__ARM_ARCH_5TE__
+    -Wno-psabi
+    -march=armv5te
+    -mtune=xscale
+    -msoft-float
+    -mthumb
+    -Os
+    -fomit-frame-pointer
+    -fno-strict-aliasing
+    -finline-limit=64
+    -DANDROID
+    -Wa,--noexecstack
+#more options
+    -fvisibility=hidden
+    -fvisibility-inlines-hidden
+    -fdata-sections
+    -DBOOST_THREAD_LINUX
+    -DBOOST_HAS_PTHREADS
+    -D_REENTRANT
+    -D_GLIBCXX__PTHREADS
+    -DANDROID
+    -D__ANDROID__
+    -DBOOST_HAS_GETTIMEOFDAY
+    -DSQLITE_OMIT_LOAD_EXTENSION
+)
+
+foreach(arg ${ANDROID_OPTION_LIST})
+  set(ANDROID_COMPILE_FLAGS "${ANDROID_COMPILE_FLAGS} ${arg}")
+endforeach(arg ${ANDROID_OPTION_LIST})
+
+SET(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER>  <DEFINES> <FLAGS> ${ANDROID_COMPILE_FLAGS} -o <OBJECT> -c <SOURCE>")
+SET(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER>  <DEFINES> <FLAGS> ${ANDROID_COMPILE_FLAGS} -o <OBJECT> -c <SOURCE>")
+
+SET(ANDROID_NDK_PREFIX "${ANDROID_SDK_ROOT}/${ANDROID_NDK_VERSION}/")
+SET(ANDROID_LINK_EXE_FLAGS
+    "-nostdlib -Bdynamic -Wl,-dynamic-linker,/system/bin/linker -Wl,--gc-sections -Wl,-z,nocopyreloc" 
+    )
+SET(ANDROID_CRT_PRE
+    "${ANDROID_NDK_PREFIX}/build/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/crtbegin_dynamic.o" 
+   )
+SET(ANDROID_CRT_POST_LIST
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libstdc++.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/toolchains/${ANDROID_NDK_PREBUILT}/prebuild/windows/lib/gcc/arm-linux-androideabi/${ANDROID_NDK_PREBUILT_VERSION}/${ANDROID_NDK_PREBUILT_VERSION}/thumb/libgcc.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libc.so" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libm.so" 
+    "-Wl,--no-undefined" 
+    "-Wl,-z,noexecstack" 
+    "-L${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib" 
+    "-llog" 
+    "-Wl,-rpath-link=${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libstdc++.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/toolchains/${ANDROID_NDK_PREBUILT}/prebuild/windows/lib/gcc/arm-linux-androideabi/${ANDROID_NDK_PREBUILT_VERSION}/${ANDROID_NDK_PREBUILT_VERSION}/thumb/libgcc.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/crtend_android.o" 
+   )
+foreach(arg ${ANDROID_CRT_POST_LIST})
+  set(ANDROID_CRT_POST "${ANDROID_CRT_POST} ${arg}")
+endforeach(arg ${ANDROID_CRT_POST_LIST})
+SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_C_COMPILER>  ${ANDROID_LINK_EXE_FLAGS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> ${ANDROID_CRT_PRE} <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> ${ANDROID_CRT_POST}")
+SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER>  ${ANDROID_LINK_EXE_FLAGS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> ${ANDROID_CRT_PRE} <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> ${ANDROID_CRT_POST}")
+
+SET(ANDROID_LINK_SHARED_FLAGS
+    "-nostdlib -Wl,-soname,<TARGET> -Wl,-shared,-Bsymbolic" 
+    )
+SET(ANDROID_LINK_SHARED_LIBS_LIST
+    "-Wl,--whole-archive" 
+    "-Wl,--no-whole-archive" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libmissing.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libstdc++.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/toolchains/${ANDROID_NDK_PREBUILT}/prebuild/windows/lib/gcc/arm-linux-androideabi/${ANDROID_NDK_PREBUILT_VERSION}/${ANDROID_NDK_PREBUILT_VERSION}/thumb/libgcc.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libc.so" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libm.so" 
+    "-Wl,--no-undefined" 
+    "-Wl,-z,noexecstack" 
+    "-Wl,-rpath-link=${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/platforms/android-${ANDROID_NDK_TARGET_PLATFORM}/arch-arm/usr/lib/libstdc++.a" 
+    "${ANDROID_NDK_PREFIX}/${ANDROID_NDK_BUILD}/toolchains/${ANDROID_NDK_PREBUILT}/prebuild/windows/lib/gcc/arm-linux-androideabi/${ANDROID_NDK_PREBUILT_VERSION}/${ANDROID_NDK_PREBUILT_VERSION}/thumb/libgcc.a" 
+   )
+foreach(arg ${ANDROID_LINK_SHARED_LIBS_LIST})
+  set(ANDROID_LINK_SHARED_LIBS "${ANDROID_LINK_SHARED_LIBS} ${arg}")
+endforeach(arg ${ANDROID_LINK_SHARED_LIBS_LIST})
+SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
+    "<CMAKE_C_COMPILER> ${ANDROID_LINK_SHARED_FLAGS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS><LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${ANDROID_LINK_SHARED_LIBS}" 
+    )

BlankUnicode.txt

@@ -0,0 +1 @@
+��

CMakeExternal.txt

@@ -0,0 +1,127 @@
+
+if( NOT __NO_GUI__ )
+
+if( NEED_JPEG )
+SET( JBASEDIR src/jpeg-9 )
+SET( SYSDEPMEM jmemnobs.c )
+
+# library object files common to compression and decompression
+SET( COMSRCS  jaricom.c jcomapi.c jutils.c jerror.c jmemmgr.c ${SYSDEPMEM} )
+
+# compression library object files
+SET( CLIBSRCS jcarith.c jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c 
+        jcinit.c jcmaster.c jcmarker.c jcmainct jcprepct.c 
+        jccoefct.c jccolor.c jcsample.c jchuff.c 
+        jcdctmgr.c jfdctfst.c jfdctflt.c jfdctint.c )
+
+# decompression library object files
+SET( DLIBSRCS jdarith.c jdapimin.c jdapistd.c jdtrans.c jdatasrc.c 
+        jdmaster.c jdinput.c jdmarker.c jdhuff.c 
+        jdmainct.c jdcoefct.c jdpostct.c jddctmgr.c jidctfst.c 
+        jidctflt.c jidctint.c jdsample.c jdcolor.c 
+        jquant1.c jquant2.c jdmerge.c )
+# These objectfiles are included in libjpeg.lib
+FOREACH( SRC ${CLIBSRCS} ${COMSRCS} ${DLIBSRCS} )
+  LIST( APPEND JPEG_SOURCE ${JBASEDIR}/${SRC} )
+ENDFOREACH( SRC )
+Set( ExternalExtraDefinitions ${ExternalExtraDefinitions} JPEG_SOURCE;NO_GETENV )
+# ya, this is sorta redundant... should fix that someday.
+include_directories( ${SACK_BASE}/${JBASEDIR} )
+
+#message( adding ${SACK_BASE}/${JPEG_SOURCE} )
+if( FORCE_CXX )
+#string( REPLACE "/RTC1" "/CLR" CMAKE_C_FLAGS_DEBUG_TMP ${CMAKE_C_FLAGS_DEBUG} )
+#set_source_files_properties(${JPEG_SOURCE} PROPERTIES LANGUAGE CXX )
+endif( FORCE_CXX )
+
+source_group("Source Files\\Jpeg-9 Library" FILES ${JPEG_SOURCE})
+
+
+endif( NEED_JPEG )
+
+
+if( NEED_PNG )
+
+ if( NEED_ZLIB )
+  SET( ZBASEDIR src/zlib-1.2.7 )
+  include( ${ZBASEDIR}/CMakeLists.part )
+if( FORCE_CXX )
+#set_source_files_properties(${ZLIB_SOURCE} PROPERTIES LANGUAGE CXX )
+endif( FORCE_CXX )
+source_group("Source Files\\zlib-1.2.7 Library" FILES ${ZLIB_SOURCE})
+ endif( NEED_ZLIB )
+
+
+ SET( PBASEDIR src/libpng-1.6.6 )
+ include( ${PBASEDIR}/CMakeLists.part )
+
+if( FORCE_CXX )
+#set_source_files_properties(${PNG_SOURCE} PROPERTIES LANGUAGE CXX )
+endif( FORCE_CXX )
+source_group("Source Files\\libpng-1.6.6 Library" FILES ${PNG_SOURCE})
+# PNG_RESTRICT is defined here (and as blank) because if not defined, it gets defined to __restrict which made watcom fail
+#set_source_files_properties(${PNG_SOURCE} PROPERTIES COMPILE_DEFINITIONS "PNG_RESTRICT" )
+endif( NEED_PNG )
+
+
+if( NEED_FREETYPE )
+SET( FBASEDIR src/freetype-2.5.0.1/src )
+
+Set( ExternalExtraDefinitions ${ExternalExtraDefinitions} FREETYPE_SOURCE FT2_BUILD_LIBRARY )
+
+SET( FT_SRCS autofit/autofit.c 
+     base/ftbase.c 
+     bdf/bdf.c 
+     cache/ftcache.c 
+     cff/cff.c 
+     cid/type1cid.c 
+     lzw/ftlzw.c 
+     gzip/ftgzip.c 
+     otvalid/otvalid.c 
+     pcf/pcf.c 
+     pfr/pfr.c 
+     psnames/psmodule.c 
+     psaux/psaux.c 
+     pshinter/pshinter.c 
+     raster/raster.c 
+     sfnt/sfnt.c 
+     smooth/smooth.c 
+     truetype/truetype.c 
+     type1/type1.c 
+     type42/type42.c 
+     winfonts/winfnt.c 
+     base/ftbitmap.c 
+     base/ftgasp.c 
+     base/ftglyph.c 
+     base/ftgxval.c 
+     base/ftinit.c 
+     base/ftmm.c 
+     base/ftotval.c 
+     base/ftpfr.c 
+     base/ftstroke.c 
+     base/ftsynth.c 
+     base/ftsystem.c 
+     base/fttype1.c 
+     base/ftwinfnt.c 
+     base/ftxf86.c  )
+
+include_directories( ${FBASEDIR}/../include )
+FOREACH( SRC ${FT_SRCS} )
+  LIST( APPEND FREETYPE_SOURCE ${FBASEDIR}/${SRC} )
+ENDFOREACH()
+if( FORCE_CXX )
+set_source_files_properties(${FREETYPE_SOURCE} PROPERTIES LANGUAGE C )
+endif( FORCE_CXX )
+endif()
+
+source_group("Source Files\\Freetype-2.5.0.1 Library" FILES ${FREETYPE_SOURCE})
+
+endif( NOT __NO_GUI__ )
+
+if( BUILD_EXTRAS )
+  IF( NOT __ANDROID__ )
+     # Android math.h puked when building this.
+     add_subdirectory( src/shapelib-1.3.0 )
+  ENDIF( NOT __ANDROID__ )
+endif( BUILD_EXTRAS )
+