1. mcc
  2. evo

Commits

mcc  committed 4bd8034

Windows compiles

  • Participants
  • Parent commits 8ca460c
  • Branches default

Comments (0)

Files changed (3)

File curl/PolycodeDownloader.h

View file
 #pragma once
 
 #include <Polycode.h>
-#include <curl/curl.h>
 
 extern "C" {	
+#include <curl/curl.h>
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"

File curl/getcurl.sh

View file
 
 # After this, go inside curl-7.2.7.0 folder and say ./configure --prefix=$PWD/../curl-product; make install
 # Then you have to go in and delete the .la and .dylib, for SOME STUPID REASON.
-# Maybe this could be avoided by telling ./configure to build static only?
+# Maybe this could be avoided by telling ./configure to build static only?
+# Windows, I built by doing this:
+# cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="Windows" -DCMAKE_TOOLCHAIN_FILE=/Users/mcc/work/p/tmp/toolchain.cmake -DCMAKE_INSTALL_PREFIX:PATH=/Users/mcc/work/p/evo/curl/curl-product-win -DCURL_STATICLIB=on -DBUILD_CURL_EXE=off -DBUILD_CURL_TESTS=off 

File package/win/Makefile

View file
 	endif
 endif
 
-LIBS = -lPolycode2DPhysics -lPolycode3DPhysics -lPolycodeLua -lPolycore -lfreetype -llibvorbisfile -llibvorbis -llibogg -lOpenAL32 -lphysfs -lpng -lzlib -lBox2D -lBulletDynamics -lBulletCollision -lBulletMultiThreaded -lBulletSoftBody -lBulletSoftBodySolvers_CPU -lBulletSoftBodySolvers_OpenCL_Mini -lLinearMath -lMiniCL -llua5.1 -lwinmm -lws2_32 -lopengl32 -lglu32 -lmingw32
-LDFLAGS = -L$(POLYROOT)/Framework/Core/lib -L$(POLYROOT)/Framework/Core/Dependencies/lib -L$(POLYROOT)/Framework/Modules/lib -L$(POLYROOT)/Framework/Modules/Dependencies/lib -L$(POLYROOT)/Framework/Bindings/Lua/Core/lib -L$(MINGW)/lib -mwindows
+LIBS = -lcurl -lPolycode2DPhysics -lPolycode3DPhysics -lPolycodeLua -lPolycore -lfreetype -llibvorbisfile -llibvorbis -llibogg -lOpenAL32 -lphysfs -lpng -lzlib -lBox2D -lBulletDynamics -lBulletCollision -lBulletMultiThreaded -lBulletSoftBody -lBulletSoftBodySolvers_CPU -lBulletSoftBodySolvers_OpenCL_Mini -lLinearMath -lMiniCL -llua5.1 -lwinmm -lws2_32 -lopengl32 -lglu32 -lmingw32
+LDFLAGS = -L$(ROOT)/curl/curl-product-win/lib -L$(POLYROOT)/Framework/Core/lib -L$(POLYROOT)/Framework/Core/Dependencies/lib -L$(POLYROOT)/Framework/Modules/lib -L$(POLYROOT)/Framework/Modules/Dependencies/lib -L$(POLYROOT)/Framework/Bindings/Lua/Core/lib -L$(MINGW)/lib -mwindows
 ROOT = ../..
 SRC = $(ROOT)/source
 TSRC = $(ROOT)/PolycodeTemplate
-CXXFLAGS = -I$(POLYROOT)/Framework/Bindings/Lua/Modules/2DPhysics/include -I$(POLYROOT)/Framework/Bindings/Lua/Modules/3DPhysics/include -I$(POLYROOT)/Framework/Bindings/Lua/Core/include -I$(POLYROOT)/Framework/Core/Dependencies/include/lua5.1 -I$(POLYROOT)/Framework/Core/include -I$(POLYROOT)/Framework/Core/Dependencies/include/AL -I$(POLYROOT)/Framework/Core/Dependencies/include -I$(POLYROOT)/Framework/Modules/Dependencies/include -I$(POLYROOT)/Framework/Modules/Dependencies/include/bullet -I$(POLYROOT)/Framework/Modules/include -I$(ROOT)/lua/Include -I$(SRC) -I$(TSRC) -D_MINGW -D_WINDOWS -DUNICODE
+CXXFLAGS = -I$(ROOT)/curl -I$(ROOT)/curl/curl-product-win/include -I$(POLYROOT)/Framework/Bindings/Lua/Modules/2DPhysics/include -I$(POLYROOT)/Framework/Bindings/Lua/Modules/3DPhysics/include -I$(POLYROOT)/Framework/Bindings/Lua/Core/include -I$(POLYROOT)/Framework/Core/Dependencies/include/lua5.1 -I$(POLYROOT)/Framework/Core/include -I$(POLYROOT)/Framework/Core/Dependencies/include/AL -I$(POLYROOT)/Framework/Core/Dependencies/include -I$(POLYROOT)/Framework/Modules/Dependencies/include -I$(POLYROOT)/Framework/Modules/Dependencies/include/bullet -I$(POLYROOT)/Framework/Modules/include -I$(ROOT)/lua/Include -I$(SRC) -I$(TSRC) -D_MINGW -D_WINDOWS -DUNICODE -DCURL_STATICLIB
 CFLAGS = $(CXXFLAGS)
 
 BUILD = $(GCC) $(CXXFLAGS)
 	rm -f LD24_win.zip
 	zip -r LD24_win.zip LD24
 
-$(PRODUCT).exe: icon.o winmain.o PolycodeTemplateApp.o bridge.o playtest.o dos.o cpVect.o program.o svgloader.o terminal.o ProjectLUA.o Physics2DLUA.o Physics3DLUA.o
-	$(LINK) icon.o winmain.o PolycodeTemplateApp.o bridge.o playtest.o dos.o cpVect.o program.o svgloader.o terminal.o ProjectLUA.o Physics2DLUA.o Physics3DLUA.o $(LIBS) -o $(PRODUCT).exe
+$(PRODUCT).exe: icon.o winmain.o PolycodeTemplateApp.o bridge.o playtest.o dos.o cpVect.o program.o PolycodeDownloader.o svgloader.o terminal.o ProjectLUA.o Physics2DLUA.o Physics3DLUA.o
+	$(LINK) icon.o winmain.o PolycodeTemplateApp.o bridge.o playtest.o dos.o cpVect.o program.o PolycodeDownloader.o svgloader.o terminal.o ProjectLUA.o Physics2DLUA.o Physics3DLUA.o $(LIBS) -o $(PRODUCT).exe
 
 icon.o:
 	$(WINDRES) -i icon.rc -o icon.o
 program.o:
 	$(BUILD) -c $(SRC)/program.cpp
 
+PolycodeDownloader.o:
+	$(BUILD) -c $(ROOT)/curl/PolycodeDownloader.cpp 
+
 svgloader.o:
 	$(BUILD) -c $(SRC)/svgloader.cpp