Browse Source

Added compatibility with LabRats

dev
wombat 6 years ago
parent
commit
e75a3a8239

+ 18
- 0
.gitmodules View File

[submodule "SNFMDaemonDLL/SNFMulti"]
path = SNFMDaemonDLL/SNFMulti
url = https://code.microneil.com/madscientist/SNFMulti.git
branch = wx
ignore = all
[submodule "SNFMDaemonDLL/CodeDweller"]
path = SNFMDaemonDLL/CodeDweller
url = https://code.microneil.com/madscientist/CodeDweller.git
branch = wx
ignore = all
[submodule "SNFMDaemonDLLx32/CodeDweller"]
path = SNFMDaemonDLLx32/CodeDweller
url = https://code.microneil.com/madscientist/CodeDweller.git
branch = wx
[submodule "SNFMDaemonDLLx32/SNFMulti"]
path = SNFMDaemonDLLx32/SNFMulti
url = https://code.microneil.com/madscientist/SNFMulti.git
branch = wx

+ 1
- 0
SNFMDaemonDLL/CodeDweller

Subproject commit bec780b987776b8f3d3d215208700dffe262610b

+ 1
- 0
SNFMDaemonDLL/SNFMulti

Subproject commit bcf22dffe0d24ded92a0cb7e9d851f772309b164

+ 1
- 0
SNFMDaemonDLL/Version.txt View File

0.1

BIN
SNFMDaemonDLL/bin/snfmdplugin.dll View File


+ 2
- 0
SNFMDaemonDLL/makefile View File

windres.exe ${WXINC} -J rc -O coff -i C:\Users\Dylan\DOCUME~1\MICRON~1\SPWXDI~2\resource.rc -o resource.res windres.exe ${WXINC} -J rc -O coff -i C:\Users\Dylan\DOCUME~1\MICRON~1\SPWXDI~2\resource.rc -o resource.res


wx: wx:
cd CodeDweller && g++ -std=gnu++11 -c *.cpp && ar rvs libCodedweller.a *.o
cd SNFMulti && g++ -std=gnu++11 -c *.cpp && ar rvs libSNFMulti.a *.o
g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE ${WXFLAGS} -Wall -O2 ${WXINC} -c configdialog.cpp -o configdialog.o g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE ${WXFLAGS} -Wall -O2 ${WXINC} -c configdialog.cpp -o configdialog.o
g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE ${WXFLAGS} -Wall -O2 ${WXINC} -c dialogapp.cpp -o dialogapp.o g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE ${WXFLAGS} -Wall -O2 ${WXINC} -c dialogapp.cpp -o dialogapp.o
g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE -g -DDEBUG -Wall -O2 ${MICRONEILLIBS} ${MICROINC} -c mdconfiguration.cpp -o mdconfiguration.o g++.exe -pipe -std=gnu++11 -mthreads -g -DUNICODE -D_UNICODE -g -DDEBUG -Wall -O2 ${MICRONEILLIBS} ${MICROINC} -c mdconfiguration.cpp -o mdconfiguration.o

+ 1
- 0
SNFMDaemonDLLx32/CodeDweller

Subproject commit 04f99e5690e25b38703b0163183060c10d5bc909

+ 1
- 0
SNFMDaemonDLLx32/SNFMulti

Subproject commit 694590d05f627b40d7c1756c5050ecb53c14d595

+ 5
- 3
wxwidgets build.sop.txt View File

in dir C:\wxWidgets-3.0.4\build\msw in dir C:\wxWidgets-3.0.4\build\msw


64bit wx build: 64bit wx build:
mingw32-make -j8 -f makefile.gcc BUILD=release UNICODE=1 SHARED=0 CXXFLAGS="-std=gnu++11"
mingw32-make SHELL=CMD.exe -f makefile.gcc BUILD=release UNICODE=1 SHARED=0 CXXFLAGS="-std=gnu++11"




in dir C:\wxWidgets-3.0.4x32\build\msw in dir C:\wxWidgets-3.0.4x32\build\msw


32bit wx compile: 32bit wx compile:
mingw32-make.exe -j8 -f makefile.gcc BUILD=release CPP="gcc -E -D_M_IX86 -m32" LDFLAGS="-m32" CPPFLAGS="-m32" WINDRES="windres --use-temp-file -F pe-i386" UNICODE=1 SHARED=0 CXXFLAGS="-m32 -fno-keep-inline-dllexport -std=gnu++11"
mingw32-make.exe -f makefile.gcc BUILD=release CPP="gcc -E -D_M_IX86 -m32" LDFLAGS="-m32" CPPFLAGS="-m32" WINDRES="windres --use-temp-file -F pe-i386" UNICODE=1 SHARED=0 CXXFLAGS="-m32 -fno-keep-inline-dllexport -std=gnu++11"




--------------------------------------- ---------------------------------------
FIX TIFF ERROR 32/64 bit FIX TIFF ERROR 32/64 bit
****************** ******************


in wx\src\tiff\libtiff\tif_config.h:

CHANGE: CHANGE:
/* MSVC 14 does have snprintf() and doesn't allow defining it */ /* MSVC 14 does have snprintf() and doesn't allow defining it */
#if !defined(_MSC_VER) || _MSC_VER < 1900 #if !defined(_MSC_VER) || _MSC_VER < 1900
# define snprintf _snprintf # define snprintf _snprintf
#endif #endif


in wx\src\tiff\libtiff\tif_config.h
----------------------------------------- -----------------------------------------





Loading…
Cancel
Save